Remove all entries for the same key, not just the first one. (#159498,

2004-12-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaccelmap.c (internal_change_entry): Remove all
	entries for the same key, not just the first one.  (#159498,
	Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index 783de5f3cbebc3d6f20fcdbf108a1d719802ebdf..2f3a5c5d5380bab64bf1675aef520ba7b39971f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaccelmap.c (internal_change_entry): Remove all 
+       entries for the same key, not just the first one.  (#159498, 
+       Christian Persch)
+
 2004-12-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Use

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 783de5f3cbebc3d6f20fcdbf108a1d719802ebdf..2f3a5c5d5380bab64bf1675aef520ba7b39971f6 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-12-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaccelmap.c (internal_change_entry): Remove all 
+       entries for the same key, not just the first one.  (#159498, 
+       Christian Persch)
+
 2004-12-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Use

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 783de5f3cbebc3d6f20fcdbf108a1d719802ebdf..2f3a5c5d5380bab64bf1675aef520ba7b39971f6 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-12-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaccelmap.c (internal_change_entry): Remove all 
+       entries for the same key, not just the first one.  (#159498, 
+       Christian Persch)
+
 2004-12-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Use

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 783de5f3cbebc3d6f20fcdbf108a1d719802ebdf..2f3a5c5d5380bab64bf1675aef520ba7b39971f6 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-12-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkaccelmap.c (internal_change_entry): Remove all 
+       entries for the same key, not just the first one.  (#159498, 
+       Christian Persch)
+
 2004-12-08  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktreeview.c (_gtk_tree_view_column_start_drag): Use

diff --git a/gtk/gtkaccelmap.c b/gtk/gtkaccelmap.c
index 46d9997cb76eb81ef661594de81273a11d9520b0..647aa70d45c8b0fd6281cdbe89b5b88992ddfaff 100644 (file)
--- a/gtk/gtkaccelmap.c
+++ b/gtk/gtkaccelmap.c
@@ -365,7 +365,7 @@ internal_change_entry (const gchar    *accel_path,
            if (!removable)
              goto break_loop_step5;
            if (ag_entry[i].accel_path_quark)
-             replace_list = g_slist_prepend (replace_list, GUINT_TO_POINTER (ag_entry->accel_path_quark));
+             replace_list = g_slist_prepend (replace_list, GUINT_TO_POINTER (ag_entry[i].accel_path_quark));
          }
       }
  break_loop_step5: